Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 20 Oct 2011 07:08:55 +0000 (00:08 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 20 Oct 2011 07:08:55 +0000 (00:08 -0700)

Trivial merge